Fix duplicate consts around xc_error declarations.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index 77321c458b98b2af58beff1a72043aadf91ed0ae..3816b0a83b2b4de40bdb6694063311ba420d13ae 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -23,7 +23,7 @@ void xc_default_error_handler(const xc_error const *err)
     fprintf(stderr, "ERROR %s: %s\n", desc, err->message);
 }
 
-const xc_error const *xc_get_last_error(void)
+const xc_error *xc_get_last_error(void)
 {
     return &last_error;
 }

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 199750de73912cd8136a8e607681253b1666d661..96ba3145034b87e9b0933d1e630d0425ae037ebc 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -770,19 +770,19 @@ typedef struct {
  * data pointed to are only valid until the next call to
  * libxc.
  */
-const xc_error const *xc_get_last_error(void);
+const xc_error *xc_get_last_error(void);
 
 /*
  * Clear the last error
  */
 void xc_clear_last_error(void);
 
-typedef void (*xc_error_handler)(const xc_error const* err);
+typedef void (*xc_error_handler)(const xc_error * const err);
 
 /*
  * The default error handler which prints to stderr
  */
-void xc_default_error_handler(const xc_error const* err);
+void xc_default_error_handler(const xc_error * const err);
 
 /*
  * Convert an error code into a text description

diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c
index b3dbb20ed7b7272964ed83b1ff8acf19591ded94..7da0288cbd04ff0c0c61e61c113de6cd51ce0357 100644 (file)
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -47,7 +47,7 @@ static PyObject *dom_op(XcObject *self, PyObject *args,
 static PyObject *pyxc_error_to_exception(void)
 {
     PyObject *pyerr;
-    const xc_error const *err = xc_get_last_error();
+    const xc_error *err = xc_get_last_error();
     const char *desc = xc_error_code_to_desc(err->code);
 
     if (err->code == XC_ERROR_NONE)